genl clean-up + inserted all code in fptree_query_alt & deleted latter [ci skip]