TODOs done
Fix basetop query