* Corrections to app lookup, added Enterprise block