Fix #10, add OR for mapped name in SQL