Add hide_to_handles and bug fix.