added parsing of swdf queries