Fix Search with SQLAlchemy & merge bugfix PRs #60 and #69