Modified to allow searching by parameter