@Query("SELECT g " +
"FROM goal g " +
"WHERE g.companyId = ?1 " +
"AND (?2 IS NULL OR g.archived = ?2) " +
-----> "AND (g.type = ?3 OR ?3 IS NULL) ")
@Query("SELECT g " +
"FROM goal g " +
"WHERE g.companyId = ?1 " +
"AND (?2 IS NULL OR g.archived = ?2) " +
-----> "AND (?3 IS NULL OR g.type = ?3) ")