optimized kirong's queries from 5 to 1