change my subscribe query logic