removed loop on query. App should load faster