Modified search function

modified search function to include options:

Can now set
    - result type
    - results per page

Added include entities by default.