Cleanup of ServiceCatalog code
Fixed Filter pagination for Device Catalog. Closes #20