Added some queries to the catalog.
Fixed some absolute path related issue.