...
- sql query fix
- minor test fix