Query system working and query components added which can be removed