class base/setup intergrated
added option beautifysearch