Updated caps code, extension checks for queries