added custom connection query property allowed and various fixes