Api view enhancements and fixes.