Fix queries on shop page