Moved index create to be on new application entity manager
Fixed UUID lookup bug