Fixes Rapid Query

Fixed methods and removed private method.