Some API/Project selection bug fixes.
Merge branch 'master' of https://github.com/cderoove/exapus.git