Fixed more catalog browsing bugs