Adding new reference removal behaviour.
Fixing EFQ, adding tabs for reference types