Merge pull request #878 from dennishendriksen/master

Various catalog bug fixes and small improvements
use single instead of double quotes
remove unused code, small fixes