Merge pull request #49 from graimundo/master

UX and filter bug fixes