merged joined resultset expander from feature/entity branch