Fixed: Wrong query
Small fixes