Cleanup and fixed lang filtering