PEP 8
Correct category entries filtering
Merge branch 'master' of https://github.com/earthreader/web