Improvements on search, stability and tables