added subject query interface
conflicts fixed