minor revision in sync w/ fptree_query_utils refactor/bug-fixing [ci skip]