ticket:1 'Site matching query' issue fixed