Merge branch 'bug-expiration-field' into hotfixes
small fix on Search.php model
Merge branch 'hotfixes' into develop