Don't add primary and hydra_set_id columns to query if calculation is performed #2