Improve unite source
Fix for new unite