(chore) [WIP] Refactor of frontend app - changes in query context handling