Fixed Server Search Terms Issue and Working on Ordering