FAIMS-526: reverting changes to android queries
FAIMS-526: updating fetch entity and relationship queries to use views
FAIMS-526: updating fetch entity / relationship lis queries to use views