M0-2-1: make into split and shared query

M0-2-1: make into split and shared query #2007