adding some queries, thus also selx case throughout. server ok