working on saving custom queries