Bug/bug fixes after filtering merge

https://www.pivotaltracker.com/story/show/58437002