[TASK] adjust query generation to updated field names

With this change, the start page works again as it should