Changes to how query is altered for subshops