moving query extensions to extra package and begin working