Remove hl param from api calls
Fix some nil errors