Change shout query, migration for new shout fields etc