Cleaned up flow query and flow query spec

See: https://www.pivotaltracker.com/story/show/84328410