Ui/modified column name in filters

https://www.pivotaltracker.com/story/show/51991677
https://www.pivotaltracker.com/story/show/56119342