updates and code cleanup
search and js from dq01