Matter of presentation, ER-Diagram

And one fix on the search servlet. =/