use single instead of double quotes
remove unused code, small fixes
fix test
Merge pull request #879 from dennishendriksen/master

Catalog: Small fixes and improvements