Merge pull request #8 from poros/highlights

Fixed simple query
Filter for sources