added catalog search API; cleaned up