Move query to entry, where it is specific to