More fixes
Merge branch 'master' of https://github.com/eduellery/graphsearchfilter
Merge branch 'master' of https://github.com/eduellery/graphsearchfilter