Prevented plugins being used in query and vise vera, closes issue #50