Various enhancements on possible queries , especially receipts