Bugfix - MUST check for duplicates and build names from query
Reverted test speed tweak in _fetch, won't work for contructed views